X-Git-Url: https://shimmer.witbreuk.eu/gitweb/UltimateKEYS.git/blobdiff_plain/9e265d16c0ced8c14012092d817237052f71ada6..abb28e2178a1a5d514372203e5d470ed0e28ba9d:/autohotkey-v2.0/UltimateKEYS%20(for%20AutoHotkey%20v2.0).ahk

diff --git a/autohotkey-v2.0/UltimateKEYS (for AutoHotkey v2.0).ahk b/autohotkey-v2.0/UltimateKEYS (for AutoHotkey v2.0).ahk
index 7dcafe2..5fd5513 100644
--- a/autohotkey-v2.0/UltimateKEYS (for AutoHotkey v2.0).ahk	
+++ b/autohotkey-v2.0/UltimateKEYS (for AutoHotkey v2.0).ahk	
@@ -89,8 +89,6 @@ cmpCaron["t"] := "{u+0165}"  ; (Å¥) t with caron
 cmpCaron["T"] := "{u+0164}"  ; (Ť) T with caron
 cmpCaron["u"] := "{u+01d4}"  ; (ǔ) u with caron
 cmpCaron["U"] := "{u+01d3}"  ; (Ǔ) U with caron
-cmpCaron["v"] := "{u+01da}"  ; (ǚ) u with diaeresis and caron
-cmpCaron["V"] := "{u+01d9}"  ; (Ǚ) U with diaeresis and caron
 cmpCaron["z"] := "{u+017e}"  ; (ž) z with caron
 cmpCaron["Z"] := "{u+017d}"  ; (Ž) Z with caron
 cmpCaron["3"] := "{u+01ef}"  ; (ǯ) small letter ezh with caron
@@ -190,8 +188,6 @@ cmpMacronStroke["t"] := "{u+0167}"  ; (ŧ) t with stroke
 cmpMacronStroke["T"] := "{u+0166}"  ; (Ŧ) T with stroke
 cmpMacronStroke["u"] := "{u+016b}"  ; (Å«) u with macron
 cmpMacronStroke["U"] := "{u+016a}"  ; (Ū) U with macron
-cmpMacronStroke["v"] := "{u+01d6}"  ; (ǖ) u with diaeresis and macron
-cmpMacronStroke["V"] := "{u+01d5}"  ; (Ǖ) U with diaeresis and macron
 cmpMacronStroke["y"] := "{u+0233}"  ; (ȳ) y with macron
 cmpMacronStroke["Y"] := "{u+0232}"  ; (Ȳ) Y with macron
 cmpMacronStroke["z"] := "{u+01b6}"  ; (ƶ) z with stroke
@@ -216,7 +212,6 @@ cmpMacronStrokeAdd["u"] := "{u+0289}"  ; (ʉ) u with bar
 cmpMacronStrokeAdd["U"] := "{u+0244}"  ; (Ʉ) U with bar
 cmpMacronStrokeAdd["y"] := "{u+024f}"  ; (ɏ) y with stroke
 cmpMacronStrokeAdd["Y"] := "{u+024e}"  ; (Ɏ) Y with stroke
-cmpMacronStrokeAdd[" "] := "{u+00af}"  ; (¯) macron
 
 
 ; Compose :  Stroke (/)
@@ -366,8 +361,6 @@ cmpAcuteAccent["s"] := "{u+015b}"  ; (ś) s with acute
 cmpAcuteAccent["S"] := "{u+015a}"  ; (Ś) S with acute
 cmpAcuteAccent["u"] := "{u+00fa}"  ; (ú) u with acute
 cmpAcuteAccent["U"] := "{u+00da}"  ; (Ú) U with acute
-cmpAcuteAccent["v"] := "{u+01d8}"  ; (ǘ) u with diaeresis and acute
-cmpAcuteAccent["V"] := "{u+01d7}"  ; (Ǘ) U with diaeresis and acute
 cmpAcuteAccent["w"] := "{u+1e83}"  ; (ẃ) w with acute
 cmpAcuteAccent["W"] := "{u+1e82}"  ; (Ẃ) W with acute
 cmpAcuteAccent["y"] := "{u+00fd}"  ; (ý) y with acute
@@ -382,6 +375,7 @@ cmpAcuteAccent["f"] := "{u+01fd}"  ; (ǽ) ae with acute
 cmpAcuteAccent["F"] := "{u+01fc}"  ; (Ǽ) AE with acute
 cmpAcuteAccent["q"] := "{u+01ff}"  ; (Ç¿) o with stroke and acute
 cmpAcuteAccent["Q"] := "{u+01fe}"  ; (Ǿ) O with stroke and acute
+cmpAcuteAccent[" "] := "{u+00b4}"  ; (´) acute accent
 
 
 ; Compose :  Diaeresis (")
@@ -436,8 +430,6 @@ cmpGraveAccent["o"] := "{u+00f2}"  ; (ò) o with grave
 cmpGraveAccent["O"] := "{u+00d2}"  ; (Ò) O with grave
 cmpGraveAccent["u"] := "{u+00f9}"  ; (ù) u with grave
 cmpGraveAccent["U"] := "{u+00d9}"  ; (Ù) U with grave
-cmpGraveAccent["v"] := "{u+01dc}"  ; (ǜ) u with diaeresis and grave
-cmpGraveAccent["V"] := "{u+01db}"  ; (Ǜ) U with diaeresis and grave
 cmpGraveAccent["w"] := "{u+1e81}"  ; (ẁ) w with grave
 cmpGraveAccent["W"] := "{u+1e80}"  ; (Ẁ) W with grave
 cmpGraveAccent["y"] := "{u+1ef3}"  ; (ỳ) y with grave
@@ -471,6 +463,8 @@ cmpTilde["e"] := "{u+1ebd}"  ; (ẽ) e with tilde
 cmpTilde["E"] := "{u+1ebc}"  ; (Ẽ) E with tilde
 cmpTilde["i"] := "{u+0129}"  ; (Ä©) i with tilde
 cmpTilde["I"] := "{u+0128}"  ; (Ĩ) I with tilde
+cmpTilde["l"] := "{u+026b}"  ; (É«) l with middle tilde
+cmpTilde["L"] := "{u+2c62}"  ; (â±¢) L with middle tilde
 cmpTilde["n"] := "{u+00f1}"  ; (ñ) n with tilde
 cmpTilde["N"] := "{u+00d1}"  ; (Ñ) N with tilde
 cmpTilde["o"] := "{u+00f5}"  ; (õ) o with tilde
@@ -481,7 +475,7 @@ cmpTilde["v"] := "{u+1e7d}"  ; (á¹½) v with tilde
 cmpTilde["V"] := "{u+1e7c}"  ; (á¹¼) V with tilde
 cmpTilde["y"] := "{u+1ef9}"  ; (ỹ) y with tilde
 cmpTilde["Y"] := "{u+1ef8}"  ; (Ỹ) Y with tilde
-cmpTilde[" "] := "{u+02dc}"  ; (˜) tilde
+cmpTilde[" "] := "{u+02dc}"  ; (˜) small tilde
 
 
 ; Compose :  Hook and Latin Greek Letters (h)
@@ -947,7 +941,6 @@ cmpCapitalT["H"] := "{u+00de}"         ; (Þ) capital letter thorn
 
 global cmpSmallN := Map()
 global cmpCapitalN := Map()
-global cmpSmallP := Map()
 global cmpCapitalP := Map()
 global cmpSmallR := Map()
 global cmpAsterisk := Map()
@@ -969,7 +962,7 @@ cmpMathSymbols["i"] := "{u+00b5}"      ; (µ) micro sign
 cmpSmallN["o"] := "{u+2116}"           ; (№) numero sign
 cmpCapitalN["o"] := "{u+2116}"         ; (№) numero sign
 cmpRingAbove["x"] := "{u+00a4}"        ; (¤) currency sign
-cmpSmallP["p"] := "{u+00b6}"           ; (¶) pilcrow sign
+cmpSuperscript["p"] := "{u+00b6}"      ; (¶) pilcrow sign
 cmpCapitalP["P"] := "{u+00b6}"         ; (¶) pilcrow sign
 cmpSmallR["2"] := "{u+221a}"           ; (√) square root
 cmpSmallR["3"] := "{u+221b}"           ; (∛) cube root
@@ -1043,7 +1036,7 @@ cmpGreaterThan["'"] := "{u+203a}"        ; (›) right-pointing single angle quo
 cmpAcuteAccent[">"] := "{u+203a}"        ; (›) right-pointing single angle quotation mark
 
 
-; Compose :  Letters with Two Accents
+; Compose :  Letters with Two Diacritical Marks
 
 global cmpCapitalU := Map()
 cmpArrow[chr(34)] := "{u+01df}"      ; (ǟ) a with diaeresis and macron
@@ -1696,10 +1689,6 @@ cmpCapitalU["``"] := "{u+01db}"      ; (Ǜ) U with diaeresis and grave
     if cmpCapitalN.Has(ihB.Input)
       Send cmpCapitalN[ihB.Input]
   }
-  else if (ihA.Input == "p") {
-    if cmpSmallP.Has(ihB.Input)
-      Send cmpSmallP[ihB.Input]
-  }
   else if (ihA.Input == "P") {
     if cmpCapitalP.Has(ihB.Input)
       Send cmpCapitalP[ihB.Input]